#M-350 Fixed
Merge pull request #793 from rustyswayne/1.4.0

#M-350 Fixed