Merge pull request #1758 from sjinks/1.2.5

[1.2.5] Bug fixes