Merge pull request #880 from rustyswayne/1.4.0

1.4.0 release
Merge remote-tracking branch 'merchello/1.4.0'
Merge remote-tracking branch 'merchello/master'
Merge pull request #955 from rustyswayne/master

Prep master for 1.5.0 merge