v1.2.5, see ChangeLog for details.
Merge branch 'release/1.2.5' into develop