Merge pull request #1004 from rustyswayne/1.6.0

Merge 1.5.2