fixes #838
Merge branch 'master' of github.com:GetSimpleCMS/GetSimpleCMS