- updating to use with Propel2
Merge remote-tracking branch 'origin/master'