v1.2.5 added to the changelog
Merge branch 'develop'