close locomotivecms/wagon#80
Merge branch 'master' of github.com:locomotivecms/mounter