Merge branch '1.12.x' into master for the 1.12.0 release!

Change-Id: I431fd0beacc247de5d566fc9313bf64db28bb6e9