Version bump
Merge branch 'release/1.2.5' into develop

* release/1.2.5:
  Version bump