Merge branch 'master' into 'export_progress'

# Conflicts:
#   disk.py

disk.py

+import shutil
+
 import json
 import json
 import shutil
 import shutil