Requesting a pull to mozilla:master from k88hudson:984592

Should this be in a separate patch?