Update changelog for 1.2.5
Version 1.2.5
Merge branch 'release-1.2.5' into develop