Merge master r12-3763.

	* Merge master r12-3763-g97cfb54c3ff1.