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

Merge r3285, r3313, and r3318 to branches/1.3. This includes fixes to…