Merge remote-tracking branch 'upstream/master' into clusteringPlots

12 jobs for clusteringPlots in 22 minutes and 20 seconds (queued for 1 second)