Requesting a pull to mozilla:master from k88hudson:t1000971

Test: http://localhost:7777/badges/webmaker-super-mentor