x1.2.5
5e0be6ad · Merge branch 'master' into extra, bumped version to 1.2.5. ·