Manual merge from mozilla/master