Work for 1.4.x being merged into master

Yes, I know I'm doing it backwards.  So sue me...