diff --git a/.travis.yml b/.travis.yml
index 77a8d8a3..8e14280f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,8 @@ python:
 
 env:
   - TOX_ENV=py27
-  - TOX_ENV=tornado2.3
-  - TOX_ENV=tornado3.2
+  - TOX_ENV=py27-tornado23
+  - TOX_ENV=py27-tornado31
   - TOX_ENV=docs
   - TOX_ENV=flake8
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index ac8084d3..b2d83144 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,18 @@ Changelog
 This changelog is used to track all major changes to Mopidy.
 
 
+v0.20.0 (UNRELEASED)
+====================
+
+**Local backend**
+
+- Add cover URL to all scanned files with MusicBrainz album IDs. (Fixes:
+  :issue:`697`, PR: :issue:`802`)
+  
+**Audio**
+
+- Tell GStreamer to not pick jack sink on raspis (Fixes: :issue:`604`)
+
 v0.19.3 (UNRELEASED)
 ====================
 
diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py
index 0c1e97e4..08552b33 100644
--- a/mopidy/audio/actor.py
+++ b/mopidy/audio/actor.py
@@ -74,6 +74,7 @@ class Audio(pykka.ThreadingActor):
 
     def on_start(self):
         try:
+            self._setup_preferences()
             self._setup_playbin()
             self._setup_output()
             self._setup_mixer()
@@ -98,6 +99,14 @@ class Audio(pykka.ThreadingActor):
         if signal_id is not None:
             element.disconnect(signal_id)
 
+    def _setup_preferences(self):
+        # Fix for https://github.com/mopidy/mopidy/issues/604
+        registry = gst.registry_get_default()
+        jacksink = registry.find_feature(
+            'jackaudiosink', gst.TYPE_ELEMENT_FACTORY)
+        if jacksink:
+            jacksink.set_rank(gst.RANK_SECONDARY)
+
     def _setup_playbin(self):
         playbin = gst.element_factory_make('playbin2')
         playbin.set_property('flags', PLAYBIN_FLAGS)