Merge pull request #2831 from comma/master

I did something.
Merge branch 'master' of https://github.com/Erthilo/Baystation12 into bleeding-edge-freeze