fixes #356
Merge branch 'hotfixes' of github.com:GetSimpleCMS/GetSimpleCMS into hotfixes