Better theme change handling
Merge branch '3.6' of github.com:impresspages/ImpressPages-CMS into 3.6
Merge branch '3.6' of github.com:impresspages/ImpressPages-CMS into 3.6