Merge pull request #1033 from rustyswayne/1.6.1

#M-551 Closed