Merge pull request #951 from rustyswayne/1.5.0

#M-465 Fixed
Merge remote-tracking branch 'merchello/1.5.0' into 1.5.0