Merge pull request #1005 from rustyswayne/1.5.2

#M-537 Fixed
Merge branch '1.5.2' into 1.6.0
1.6.0 release build
Merge pull request #1007 from rustyswayne/1.6.0

1.6.0 release build