Merge branch 'master' into 'develop'

# Conflicts:
#   .gitlab-ci.yml
2 jobs for develop in 12 minutes and 29 seconds (queued for 9 seconds)