Version 1.2.5.
Merge branch 'master' into pbs

Conflicts:
	config/app_version.yml
Version 1.2.5-pbs.