Merge changes from 2.5 into 2.6#14999

JoergAtGithub merged 3 commits into

2.6mixxxdj/mixxx:2.6from

sync-branch-2.5-to-2.6mixxxdj/mixxx:sync-branch-2.5-to-2.6Copy head branch name to clipboard