Staged merge from 1.3 branch pre 1.4 release

/cc @jtuple @jrwest @russelldb @slfritchie 
Please take a look if you have a minute.  Most tests pass, but the overload tests timed out for me. I haven't had time to look into that. My machine is very slow, so it might not be a real problem