Merge my changes into your 4.4 branch

Chris,

The following changes will add my features into your 4.4 branch. There are a couple of changes (bc4915b) that will not work for 4.2 and 4.3.

Enjoy!

Ken