fixed #327
Merge branch 'master' of github.com:redaxo/redaxo4