Merge branch 'develop' of github.com:mopidy/mopidy into develop

mopidy/backends/spotify/session_manager.py

@@ -118,6 +118,7 @@ class SpotifySessionManager(BaseThread, PyspotifySessionManager):
             'channels': channels,
         }
         self.gstreamer.emit_data(capabilites, bytes(frames))
+        return num_frames
 
     def play_token_lost(self, session):
         """Callback used by pyspotify"""

mopidy/settings.py

@@ -26,7 +26,8 @@ BACKENDS = (
 #: details on the format.
 CONSOLE_LOG_FORMAT = u'%(levelname)-8s %(message)s'
 
-#: Which GStreamer bin description to use in :class:`mopidy.outputs.CustomOutput`.
+#: Which GStreamer bin description to use in
+#: :class:`mopidy.outputs.custom.CustomOutput`.
 #:
 #: Default::
 #: