Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yaml/csm.yaml
2 jobs for master in 19 minutes and 30 seconds (queued for 4 minutes and 41 seconds)