Apply vanilla 3.13.2 patches
Merge branch 'master' (3.13.2) into vanilla-ravion