Bug 875449 - Bustage fix.
Merge m-c to birch.