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