Merge remote-tracking branch 'upstream/2.1' into 2.2

Conflicts:
	CHANGELOG
	src/defs_version.h

1 files changed, 8 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 0dfa20c782..7aae1f6992 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,14 @@ Miscellaneous
   scrolling waveforms.
 * Support IRC/AIM/ICQ broadcast metadata.
 
+==== 2.1.7 2019-01-15 ====
+
+* Fix syncing to doublespeed lp:1808697
+* Fix issues when changing beats of a synced track lp:1808698 
+* Fix direction of pitch bend buttons when inverting rate slider lp:1770745
+* Use first loaded deck if no playing deck is found lp:1784185
+* Encode file names correctly on macOS lp:1776949 	
+
 ==== 2.1.6 2018-12-23 ====
 
 * Fix crash when loading a Qt5 Soundsource / Vamp Plug-In. lp:1774639 * Validate effect parameter range. lp:1795234