performance optimisation
Merge branch 'master' of git://github.com/rapila/cms-base