Set version to 1.2.5
Regenerated build/
Merge branch '1.2.5'
Merge pull request #1819 from sjinks/master

Set version to 1.2.5