Merge changes from the v1.4 branch.
BUMP 1.5.0alpha1