Merge pull request #786 from rustyswayne/1.4.0

#M-340 Fixed