#M-326 Fixed
Merge pull request #775 from rustyswayne/1.3.0

#M-326 Fixed
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0