Merge remote-tracking branch 'parisson/release/1.6.4' into release/1.7

Conflicts:
	docker-compose.yml
	setup.py
	telemeta/views/core.py

diff --cc app/scripts/app.sh
Simple merge

diff --cc app/settings.py
Simple merge

diff --cc telemeta/urls.py
Simple merge

diff --cc telemeta/views/core.py
index 6857ccae83a0ff822a18e31271429333ed29dca0,24427e6a1119d835b9f524e497953cf36ab0270a..79ea391cd17fd8b4df8a128e854ebc13ca1aeded
--- 1/telemeta/views/core.py
--- 2/telemeta/views/core.py
+++ b/telemeta/views/core.py
@@@ -121,20 -122,28 +122,17 @@@ def nginx_media_accel(media_path, conte
      return response
  
  
 -def render(request, template, data=None, mimetype=None):
 +def render(request, template, data=None, content_type=None):
      return render_to_response(template, data, context_instance=RequestContext(request),
 -                              mimetype=mimetype)
 +                              content_type=content_type)
 +
  
  
- def stream_from_processor(decoder, encoder, flag):
+ def stream_from_processor(decoder, encoder):
      pipe = decoder | encoder
      for chunk in pipe.stream():
          yield chunk
-     flag.value = True
-     flag.save()
-     
  
 -        
 -def stream_from_file(file):
 -    chunk_size = 0x100000
 -    f = open(file, 'r')
 -    while True:
 -        chunk = f.read(chunk_size)
 -        if not len(chunk):
 -            f.close()
 -            break
 -        yield chunk
 -
 -
  def get_item_access(item, user):
      # Item access rules according to this workflow:
      # https://docs.google.com/spreadsheet/ccc?key=0ArKCjajoOT-fdDhJSDZoaUhqdDJvVkY5U3BXUWpNT0E#gid=0

diff --cc telemeta/views/item.py
index 0661097513fa0efd88ecb28e3a4511c257729d20,df24ffb5d73441fab0dd6e5ac57e40daf94f9d54..591ee6739a48a68de339f11dffd3397cf886f88d
--- 1/telemeta/views/item.py
--- 2/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@@ -280,10 -299,10 +299,10 @@@ class ItemView(ItemBaseMixin)
                  graph.watermark('timeside', opacity=.6, margin=(5, 5))
                  #f = open(path, 'w')
                  graph.render(output=path)
-                 #f.close()
+                 # f.close()
                  self.cache_data.add_file(image_file)
  
 -        response = StreamingHttpResponse(self.cache_data.read_stream_bin(image_file), content_type=mime_type)
 +        response = serve_media(path, content_type=mime_type)
          return response
  
      def list_export_extensions(self):