Merge branch 'hotfixes-v0.6.0a'

synapse/media/v1/base_resource.py

@@ -139,6 +139,7 @@ class BaseMediaResource(Resource):
             @download.addBoth
             def callback(media_info):
                 del self.downloads[key]
+                return media_info
         return download
 
     @defer.inlineCallbacks