#1638 - Typo amend
Merge remote-tracking branch 'origin/feature-138-propel17-install' into feature-138-propel17-install

Conflicts:
	app/config/config.yml