BS12 dev-branch fixes and Borer addition.
Merge branch 'master' of https://github.com/Eclipzed/marinestation24