Merge in r55173 as per Amine's request. Also apply Cameron's patch that attempts...