pimcore 1.4.9 source
Merge branch 'master' of https://github.com/chix/pimcore-149
ported changes from our custom 1.4.8 version (https://github.com/chix/pimcore-148)