Merge pull request #3391 from Kilakk/dev

Changed ERT headsets to show the Supply channel
Merge remote-tracking branch 'upstream/dev' into dev
Added Erthilo's commit to the changelog - whoops