Aply vanilla 3.13.7 patches
Merge branch 'master' (3.13.7) into vanilla-ravion