Merge remote-tracking branch 'merchello/1.4.0' into 1.4.0
Merge remote-tracking branch 'merchello/1.4.0' into 1.4.0
Merge remote-tracking branch 'merchello/1.4.0' into 1.4.0
Merge pull request #891 from rustyswayne/1.4.1

#M-401 Fixed
Merge remote-tracking branch 'merchello/1.4.1' into 1.4.1
#M-402 Fixed
Merge remote-tracking branch 'origin/1.4.1' into 1.4.1