Version 1.2.5.
Merge branch 'master' into 2.1

Conflicts:
	config/app_version.yml
Version 1.2.5-2.1.
App version is 1.2.5-2.1