Merge pull request #961 from rustyswayne/1.5.1

#M-500 Fixed