Merge pull request #1270 from sjinks/1.2.4

[1.2.4] Fix #1263
Regenerating build [ci skip]