V1.4.x merge

Represents the result of merging v1.4.x back into master.