Merge remote-tracking branch 'upstream/master' into lv2_support2

Conflicts:
	.travis.yml
	src/effects/effect.cpp
	src/effects/effect.h
	src/effects/effectchainmanager.h
	src/effects/effectinstantiator.h
	src/effects/effectmanifest.h
	src/effects/effectrack.cpp
	src/effects/native/autopaneffect.cpp
	src/effects/native/balanceeffect.cpp
	src/effects/native/biquadfullkilleqeffect.h
	src/effects/native/bitcrushereffect.cpp
	src/effects/native/echoeffect.cpp
	src/effects/native/echoeffect.h
	src/effects/native/filtereffect.cpp
	src/effects/native/flangereffect.cpp
	src/effects/native/loudnesscontoureffect.cpp
	src/effects/native/phasereffect.cpp
	src/effects/native/reverbeffect.cpp
	src/effects/native/threebandbiquadeqeffect.h
	src/engine/effects/engineeffect.cpp
	src/engine/effects/engineeffect.h
	src/mixxx.cpp
	src/preferences/dialog/dlgpreferences.cpp
	src/preferences/dialog/dlgpreferences.h
	src/test/metaknob_link_test.cpp
	src/test/nativeeffects_test.cpp

1 files changed, 3 insertions, 2 deletions

diff --git a/SConstruct b/SConstruct
index ff5cf3ff26..d972fa0572 100644
--- a/SConstruct
+++ b/SConstruct
@@ -64,8 +64,9 @@ available_features = [features.Mad,
                       features.IPod,
                       features.FFMPEG,
 
-		     # Experimental features
-		     features.OpenGLES
+                      # Experimental features
+                      features.OpenGLES,
+                      features.QtKeychain
                       ]
 
 build = mixxx.MixxxBuild(target, machine, build_type,