Fixes #5563
Merge pull request #5613 from comma/master

Fixes #5563
Merge branch 'master' of https://github.com/Baystation12/Baystation12