Changes from Harvey.
Merge branch 'master' of https://github.com/JojoCMS/Jojo-CMS