Fixed #360, propelorm/Propel#602
Merge pull request #357 from marcj/issue-340

Fixed #360, propelorm/Propel#602