Merge pull request #729 from mcmonkey4eva/master

Pull request for 1.7.5 compatibility