Apply vanilla 3.10.1 patches
Merge branch 'master' 3.10.1 into vanilla-ravion