Rebase from  'master' 1.0.12 https://github.com/modxcms/evolution