Merge branch 'master' of git@github.com:everedit/addons.git
Merge branch 'master' of git@github.com:morler/addons.git