Merge remote-tracking branch 'upstream/master'

Author: MattesR

.gitignore

@@ -13,6 +13,7 @@
 __pycache__
 *.pyc
 /collection*.txt
+/collection*.sh
 /settings/*/
 /settings/*-testing.py
 /.python-version
@@ -21,4 +22,4 @@ __pycache__
 /.cache
 /.pytest_cache
 /.venv
-/.vscode
+/.vscode