A bit of cleanup before the freeze

NoisyCoilrequested to merge
freeze-cleanup into debian/unstable

We should probably ask upstream to do a new release now that support for custom branding was added. If they do so I'll rebase this MR.

Merge request reports