1.4.9

This is a backport of certain 2.0 features and bug fixes to the 1.4 branch.