Merge pull request #1009 from rustyswayne/master

Merge 1.5.2