Last 1.4 commit before merging into master.