fixes #484
Merge branch 'master' of https://github.com/locomotivecms/engine