Merge branch 'master' of git://github.com/mixxxdj/mixxx into starrating_widget
Merge branch 'master' of git://github.com/mixxxdj/mixxx into starrating_widget
Merge remote-tracking branch 'mixxxdj/pr/380'