Merge pull request #1010 from rustyswayne/master

Merge 1.6.0