Merge pull request #1819 from sjinks/master

Set version to 1.2.5
Merge pull request #1822 from sjinks/1.2.5

[master] Regenerate build/
Merge remote-tracking branch 'upstream/master'