Patchtomaster

I believe there are all the changes from the patch branch that are not in the Master branch.  Master should reflect the current shipping version.