* Last minute minimal updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/locales/fr.yml