Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
Fix for a runtime.
Merge pull request #5329 from comma/dev

mastere -> dev merge and a fix