Merge 1.4 into master