Merge branch 'master' into 'dev2'

# Conflicts:
#   dev2/dev2.yaml
5 jobs for dev2 in 25 seconds (queued for 2 seconds)