Preparing for 1.4 release.
Merged from master.