#M-340 Fixed
Merge pull request #786 from rustyswayne/1.4.0

#M-340 Fixed
.
Merge remote-tracking branch 'merchello/1.4.0' into 1.4.0