Merge branch 'master' into plotting

4 jobs for plotting in 5 minutes and 23 seconds