Merge branch 'master' into 'p1'

# Conflicts:
#   doc/conf.py
12 jobs for p1 in 2 minutes and 15 seconds (queued for 8 seconds)