Merge master r12-1539.

	* Merge master r12-1539-gbdfc1207bd20.