Fixes #508
Merge branch 'master' of https://github.com/gossi/Propel2