Merge pull request #1338 from sjinks/1.2.4

[1.2.4] Backport of #1137