Bug 839913 - Followup: merge to aurora better; r=bz a=bustage