Merge remote-tracking branch 'upstream/release_15.03' into release_15.05

Conflicts:
	config/plugins/interactive_environments/ipython/config/ipython.ini.sample

config/plugins/interactive_environments/ipython/config/ipython.ini.sample

@@ -12,7 +12,7 @@
 command = docker
 
 # The docker image name that should be started.
-image = bgruening/docker-ipython-notebook
+image = bgruening/docker-ipython-notebook:0.2
 
 # Additional arguments that are passed to the `docker run` command.
 command_inject = --sig-proxy=true

lib/galaxy/webapps/galaxy/api/job_files.py

@@ -99,7 +99,12 @@ class JobFilesAPIController( BaseAPIController ):
         try:
             shutil.move( input_file.name, path )
         finally:
-            input_file.close()
+            try:
+                input_file.close()
+            except OSError:
+                # Fails to close file if not using nginx upload because the
+                # tempfile has moved and Python wants to delete it.
+                pass
         return {"message": "ok"}
 
     def __authorize_job_access(self, trans, encoded_job_id, **kwargs):