Tagged from towtruck.mozillalabs.com branch for deployment