Merge pull request #1915 from sjinks/1.2.6

[1.2.6] Fix #1912