Merge pull request #901 from sjinks/1.2.1

Regenerate builds from the latest HEAD