propelorm/Propel2 — pull request #387 by marcj (2013-05-14 23:55:38+00:00)
Title: Fixed #381. Ported propelorm/propel#562

Fixed #381.
Ported propelorm/propel#562 and propelorm/propel#618