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