Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Fixed issue from changelog merge
Merge pull request #6091 from Whitellama/dev

Fixes issue with changelog merge