Merge pull request #1008 from rustyswayne/1.6.0

1.6.0 release build