Merge branch 'master' of github.com:MozillaOnline/tpmanager
Merge branch 'master' of github.com:MozillaOnline/tpmanager