feature #634
Merge branch 'master' of github.com:GetSimpleCMS/GetSimpleCMS