Fix #630
Merge branch 'master' of github.com:impresspages/ImpressPages