implement https://bugs.launchpad.net/mixxx/+bug/1180052
Merge remote-tracking branch 'upstream/master' into beatgrid_sync
Merge branch 'master' into beatgrid_sync
Merge branch 'master' into beatgrid_sync
Merge branch 'master' into beatgrid_sync
change text and add test
Update to work with master sync
Merge branch 'master' into beatgrid_sync

Conflicts:
	res/skins/Deere1920x1080-FullHD/skin.xml
Merge remote-tracking branch 'mixxxdj/pr/318'
Fix test build.