76 files changed, 48 insertions, 5 deletions

diff --git a/res/controllers/midi-components-0.0.js b/res/controllers/midi-components-0.0.js
index 14c47c742c..5505176a88 100644
--- a/res/controllers/midi-components-0.0.js
+++ b/res/controllers/midi-components-0.0.js
@@ -258,7 +258,7 @@
                         this.longPressTimer = engine.beginTimer(this.longPressTimeout, function() {
                             engine.setValue(this.group, "sync_enabled", 1);
                             this.longPressTimer = 0;
-                        }, true);
+                        }.bind(this), true);
                     } else {
                         engine.setValue(this.group, "sync_enabled", 0);
                     }
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index 65ee923b31..d1c1b96815 100644
--- a/res/linux/org.mixxx.Mixxx.metainfo.xml
+++ b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -698,12 +698,13 @@
  </ul>
 </description>
     </release>
-    <release version="2.3.1" type="development">
+    <release version="2.3.1" date="2021-09-29" type="stable">
       <description>
  <ul>
   <li>
-   Added mapping for the Numark DJ2GO Touch controller
+   Added mapping for the Numark DJ2GO2 Touch controller
    #4108
+   #4287
   </li>
   <li>
    Added mapping for the Numark Mixtrack Pro FX controller
@@ -714,6 +715,19 @@
    #4262
   </li>
   <li>
+   Updated mapping for Denon MC7000 controller
+   #4021
+  </li>
+  <li>
+   Hercules Inpulse 300: Add better FX controls and other minor improvements
+   #4246
+  </li>
+  <li>
+   Denon MC7000: Improve slip mode and jog wheel handling
+   #4021
+   #4324
+  </li>
+  <li>
    Disabled detection of keyboards and mice as HID controllers
    #4243
   </li>
@@ -759,6 +773,7 @@
    #4041
    #4059
    #4107
+   #4296
   </li>
   <li>
    Fix support for relative paths in the skin system which caused missing images in third-party skins
@@ -824,6 +839,20 @@
    #4267
    lp:1941743
   </li>
+  <li>
+   Fix Auto DJ skipping tracks randomly
+   #4319
+   lp1941989
+  </li>
+  <li>
+   Fix high CPU load due to extremely high internal sync clock values
+   #4312
+   lp1943320
+  </li>
+  <li>
+   Fix preference option for re-analyzing beatgrids imported from other software
+   #4288
+  </li>
  </ul>
  <p>
   Packaging
@@ -863,6 +892,7 @@
   <li>
    Install multiple sizes of rasterized icons
    #4204
+   #4315
   </li>
   <li>
    CMake: Fixed detection of SoundTouch pkgconfig file and version
@@ -871,6 +901,7 @@
   <li>
    Fix AppStream metainfo
    #4205
+   #4317
   </li>
  </ul>
 </description>
@@ -1632,7 +1663,8 @@
   </li>
   <li>
    Fix playlist import.
-   lp:16878282
+   #2200
+   lp:1687828
   </li>
   <li>
    Fix updating playlist labels.
diff --git a/res/skins/QMLDemo/AuxiliaryUnit.qml b/res/qml/AuxiliaryUnit.qml
index 62eb11118f..62eb11118f 100644
--- a/res/skins/QMLDemo/AuxiliaryUnit.qml
+++ b/res/qml/AuxiliaryUnit.qml
diff --git a/res/skins/QMLDemo/Button.qml b/res/qml/Button.qml
index 133ce7e213..133ce7e213 100644
--- a/res/skins/QMLDemo/Button.qml
+++ b/res/qml/Button.qml
diff --git a/res/skins/QMLDemo/ComboBox.qml b/res/qml/ComboBox.qml
index d5d5e82ae5..d5d5e82ae5 100644
--- a/res/skins/QMLDemo/ComboBox.qml
+++ b/res/qml/ComboBox.qml
diff --git a/res/skins/QMLDemo/ControlButton.qml b/res/qml/ControlButton.qml
index 6a44ef06e2..6a44ef06e2 100644
--- a/res/skins/QMLDemo/ControlButton.qml
+++ b/res/qml/ControlButton.qml
diff --git a/res/skins/QMLDemo/ControlKnob.qml b/res/qml/ControlKnob.qml
index 6808070808..6808070808 100644
--- a/res/skins/QMLDemo/ControlKnob.qml
+++ b/res/qml/ControlKnob.qml
diff --git a/res/skins/QMLDemo/ControlMiniKnob.qml b/res/qml/ControlMiniKnob.qml
index 5cdffcac25..5cdffcac25 100644
--- a/res/skins/QMLDemo/ControlMiniKnob.qml
+++ b/res/qml/ControlMiniKnob.qml
diff --git a/res/skins/QMLDemo/ControlSlider.qml b/res/qml/ControlSlider.qml
index add929ffc9..add929ffc9 100644
--- a/res/skins/QMLDemo/ControlSlider.qml
+++ b/res/qml/ControlSlider.qml
diff --git a/res/skins/QMLDemo/CrossfaderRow.qml b/res/qml/CrossfaderRow.qml
index a3a35530b1..a3a35530b1 100644
--- a/res/skins/QMLDemo/CrossfaderRow.qml
+++ b/res/qml/CrossfaderRow.qml
diff --git a/res/skins/QMLDemo/Deck.qml b/res/qml/Deck.qml
index d3661dc5d6..d3661dc5d6 100644
--- a/res/skins/QMLDemo/Deck.qml
+++ b/res/qml/Deck.qml
diff --git a/res/skins/QMLDemo/DeckInfoBar.qml b/res/qml/DeckInfoBar.qml
index 6d43f93cd4..6d43f93cd4 100644
--- a/res/skins/QMLDemo/DeckInfoBar.qml
+++ b/res/qml/DeckInfoBar.qml
diff --git a/res/skins/QMLDemo/DeckRow.qml b/res/qml/DeckRow.qml
index b4f9cb96a0..b4f9cb96a0 100644
--- a/res/skins/QMLDemo/DeckRow.qml
+++ b/res/qml/DeckRow.qml
diff --git a/res/skins/QMLDemo/EffectRow.qml b/res/qml/EffectRow.qml
index 16c8d55f0c..16c8d55f0c 100644
--- a/res/skins/QMLDemo/EffectRow.qml
+++ b/res/qml/EffectRow.qml
diff --git a/res/skins/QMLDemo/EffectSlot.qml b/res/qml/EffectSlot.qml
index da767a616b..da767a616b 100644
--- a/res/skins/QMLDemo/EffectSlot.qml
+++ b/res/qml/EffectSlot.qml
diff --git a/res/skins/QMLDemo/EffectUnit.qml b/res/qml/EffectUnit.qml
index 4cab128f49..4cab128f49 100644
--- a/res/skins/QMLDemo/EffectUnit.qml
+++ b/res/qml/EffectUnit.qml
diff --git a/res/skins/QMLDemo/EmbeddedBackground.qml b/res/qml/EmbeddedBackground.qml
index 85a2e5f17a..85a2e5f17a 100644
--- a/res/skins/QMLDemo/EmbeddedBackground.qml
+++ b/res/qml/EmbeddedBackground.qml
diff --git a/res/skins/QMLDemo/EmbeddedText.qml b/res/qml/EmbeddedText.qml
index 2902af7049..2902af7049 100644
--- a/res/skins/QMLDemo/EmbeddedText.qml
+++ b/res/qml/EmbeddedText.qml
diff --git a/res/skins/QMLDemo/EqColumn.qml b/res/qml/EqColumn.qml
index aab9c4200a..aab9c4200a 100644
--- a/res/skins/QMLDemo/EqColumn.qml
+++ b/res/qml/EqColumn.qml
diff --git a/res/skins/QMLDemo/EqKnob.qml b/res/qml/EqKnob.qml
index e3102de623..e3102de623 100644
--- a/res/skins/QMLDemo/EqKnob.qml
+++ b/res/qml/EqKnob.qml
diff --git a/res/skins/QMLDemo/FadeBehavior.qml b/res/qml/FadeBehavior.qml
index 4978b8525c..4978b8525c 100644
--- a/res/skins/QMLDemo/FadeBehavior.qml
+++ b/res/qml/FadeBehavior.qml
diff --git a/res/skins/QMLDemo/Hotcue.qml b/res/qml/Hotcue.qml
index 1ff2579b49..1ff2579b49 100644
--- a/res/skins/QMLDemo/Hotcue.qml
+++ b/res/qml/Hotcue.qml
diff --git a/res/skins/QMLDemo/HotcueButton.qml b/res/qml/HotcueButton.qml
index 4aa2d1a691..4aa2d1a691 100644
--- a/res/skins/QMLDemo/HotcueButton.qml
+++ b/res/qml/HotcueButton.qml
diff --git a/res/skins/QMLDemo/HotcuePopup.qml b/res/qml/HotcuePopup.qml
index 7a7a76ad25..7a7a76ad25 100644
--- a/res/skins/QMLDemo/HotcuePopup.qml
+++ b/res/qml/HotcuePopup.qml
diff --git a/res/skins/QMLDemo/InfoBarButton.qml b/res/qml/InfoBarButton.qml
index 51962df1e6..51962df1e6 100644
--- a/res/skins/QMLDemo/InfoBarButton.qml
+++ b/res/qml/InfoBarButton.qml
diff --git a/res/skins/QMLDemo/Knob.qml b/res/qml/Knob.qml
index 8405716bb0..8405716bb0 100644
--- a/res/skins/QMLDemo/Knob.qml
+++ b/res/qml/Knob.qml
diff --git a/res/skins/QMLDemo/Library.qml b/res/qml/Library.qml
index 1fe9921102..1fe9921102 100644
--- a/res/skins/QMLDemo/Library.qml
+++ b/res/qml/Library.qml
diff --git a/res/skins/QMLDemo/MicrophoneDuckingPanel.qml b/res/qml/MicrophoneDuckingPanel.qml
index c209039ada..c209039ada 100644
--- a/res/skins/QMLDemo/MicrophoneDuckingPanel.qml
+++ b/res/qml/MicrophoneDuckingPanel.qml
diff --git a/res/skins/QMLDemo/MicrophoneUnit.qml b/res/qml/MicrophoneUnit.qml
index 5a610fc86c..5a610fc86c 100644
--- a/res/skins/QMLDemo/MicrophoneUnit.qml
+++ b/res/qml/MicrophoneUnit.qml
diff --git a/res/skins/QMLDemo/MiniKnob.qml b/res/qml/MiniKnob.qml
index 7fce622df6..7fce622df6 100644
--- a/res/skins/QMLDemo/MiniKnob.qml
+++ b/res/qml/MiniKnob.qml
diff --git a/res/skins/QMLDemo/Mixer.qml b/res/qml/Mixer.qml
index 3a208f1e3f..3a208f1e3f 100644
--- a/res/skins/QMLDemo/Mixer.qml
+++ b/res/qml/Mixer.qml
diff --git a/res/skins/QMLDemo/MixerColumn.qml b/res/qml/MixerColumn.qml
index 3bf9315421..3bf9315421 100644
--- a/res/skins/QMLDemo/MixerColumn.qml
+++ b/res/qml/MixerColumn.qml
diff --git a/res/skins/QMLDemo/Mixxx/Controls/Knob.qml b/res/qml/Mixxx/Controls/Knob.qml
index aa986b02ec..aa986b02ec 100644
--- a/res/skins/QMLDemo/Mixxx/Controls/Knob.qml
+++ b/res/qml/Mixxx/Controls/Knob.qml
diff --git a/res/skins/QMLDemo/Mixxx/Controls/Slider.qml b/res/qml/Mixxx/Controls/Slider.qml
index c2ed3c959f..c2ed3c959f 100644
--- a/res/skins/QMLDemo/Mixxx/Controls/Slider.qm