Apply valilla 3.10.5 patches
Merge branch 'master' into vanilla-ravion