Merge branch 'master' into 'users/bosquet/fixAutomationServiceDoc'

# Conflicts:
#   docs/code-mirroring.md
8 jobs for users/bosquet/fixAutomationServiceDoc in 26 seconds (queued for 1 second)