Merge some pending pull requests in the Propel project