Bug 904831 - Followup: clobber
Merge m-c to inbound.