Merge branch 'nightly' into 'nightly'

fixes this issue: https://quitter.se/notice/4344600



See merge request !71

classes/File.php

@@ -424,7 +424,11 @@ class File extends Managed_DataObject
             if (self::hashurl($url) !== $this->urlhash) {
                 // For indexing purposes, in case we do a lookup on the 'url' field.
                 // also we're fixing possible changes from http to https, or paths
+                try {
 	                $this->updateUrl($url);
+                } catch (ServerException $e) {
+                	//
+                }      
             }
             return $url;
         }