Merge master r12-806.

	* Merge master r12-806-g0e3702f8daee.