port PR #704 from Propel 1.6
port PR #704 from Propel 1.6
Merge pull request #416 from auss/patch-2

port PR #704 from Propel 1.6