Merge branch 'master' into dev_36-replace-wrong-paths-in-tutorials

3 jobs for dev_36-replace-wrong-paths-in-tutorials
in 8 seconds, using 0 compute credits, and was queued for 3 seconds