Merge branch 'master' into 'spherical_plots'

Master

See merge request !136
4 jobs for spherical_plots in 4 minutes and 30 seconds (queued for 1 second)