Merge 1.4 into master and reconcile changes.

@jared @aberghage