Requesting a pull to mozilla:master from k88hudson:1023521

good idea, i'll switch it to a span