Merge branch 'master' into 'develop'

# Conflicts:
#   .gitignore
8 jobs for develop in 22 minutes and 9 seconds (queued for 3 seconds)