Branch: Minor fix
Merge branch 'master' of github.com:vbuilder/cms