Merge pull request #1820 from sjinks/1.2.5

[1.2.5] Set version to 1.2.5
Merge pull request #1821 from sjinks/1.2.5

[1.2.5] Regenerate build/