Merge pull request #785 from rustyswayne/1.4.0

#M-337 Fixed