Pre update for 1.4 before I get the latest changes from contributors.
Merge remote-tracking branch 'origin/master'
1.4 update.