Updated to Hg commit 035310b4c93e, June 13 2013