Merge remote-tracking branch 'origin/release' into release

# Conflicts:
#	docker-compose.yml

docker-compose.yml

@@ -8,7 +8,7 @@ services:
         environment:
             - PYTHONUNBUFFERED=1
         volumes:
-            - ./docker-work/users:/users
-            - ./docker-work/backup:/backup
-            - ./docker-work/settings:/settings
+            - ./users:/users
+            - ./backup:/backup
+            - ./settings:/settings
             - /etc/localtime:/etc/localtime:ro