Bug 1109752 - Bustage Fix.
(forgot to save, I should have had more caffeine)
Merge from default

--HG--
branch : production