Missed stuff.
Merge remote-tracking branch 'vanilla/master'
Reducing opportunity for complex merge conflicts.
Conflicts.