3.1u1 release prep
Merge branch 'master' into General_Bugs