Closes #269
Merge branch '3.4' of github.com:impresspages/ImpressPages-CMS into 3.4