Import changes from mozilla:master