Merge branch 'merge' into merge-all

attic/helpers.py

@@ -512,7 +512,7 @@ def remove_surrogates(s, errors='replace'):
     return s.encode('utf-8', errors).decode('utf-8')
 
 
-_safe_re = re.compile('^((..)?/+)+')
+_safe_re = re.compile('^((\.\.)?/+)+')
 
 
 def make_path_safe(path):