master sync first merge

Hey look it's a merge request, mirroring https://code.launchpad.net/~ywwg/mixxx/atomic-master-sync/+merge/164272