Merge master r12-781.

	* Merge master r12-781-g1f6fc2826d19.