Merge pull request #1871 from sjinks/1.2.6

[1.2.6] Attempt to fix #1829