Merge pull request #949 from rustyswayne/1.5.0

#M-461 Fixed