Merge pull request #1497 from sjinks/1.2.5

[1.2.5] Implement #987