closes #647
Merge branch 'master' of https://github.com/locomotivecms/engine