Merge branch 'master' into 'custom-renku-url'

# Conflicts:
#   teach_auto/collect_forks.py
1 job for custom-renku-url in 13 seconds (queued for 2 seconds)