Merge pull request #978 from rustyswayne/1.5.1

#M-519 Fixed