This repository was archived by the owner on Mar 25, 2018. It is now read-only.

Merge bleeding_edge revision 5952 from bleeding_edge to 2.5 branch to…