Merge master into prod

This should fix the failures we are seeing on prod, such as http://qa-selenium.mv.mozilla.com:8080/view/AMO/job/amo.prod.saucelabs/306/testReport/