Merge branch 'master' into 'develop-Season_compiled'

# Conflicts:
#   NEWS.md
1 job for develop-Season_compiled
in 3 minutes and 47 seconds, using 0 compute credits, and was queued for 2 seconds