modifies propel-init
Merge branch 'master' into devel