Fix issue #301
Merge branch 'dev' of https://github.com/anchorcms/anchor-cms into dev