Merge pull request #78 from s-matt/master

Solves BUG PIMCORE-2101

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@3930 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
build auto version (2977) ...

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@3931 1f8fe7d8-47f0-464c-8d0a-336f4953ab05