Fix #249
Merge branch 'master' of github.com:mozilla/towtruck