Merge/hotfix 4.7 *** DO NOT MERGE YET ***

cc @sendhil  
Not sure about these commits from Nov 24 - Dec 3.  Did we have some stuff for 4.6 that wasn't merged forward?