Merge branch 'master' into 'dev_user_interface'

# Conflicts:
#   diagonals/examples/examples-moc.py
#   diagonals/examples/examples-regionmean.py
4 jobs for dev_user_interface
in 3 minutes and 20 seconds, using 0 compute credits, and was queued for 7 seconds