Fuck.
Merge remote-tracking branch 'vanilla/master'

Vanilla updates.
Some branding.