Merge branch 'master' into 'develop'

# Conflicts:
#   CHANGELOG.md
#   VERSION
5 jobs for develop in 2 minutes and 15 seconds (queued for 7 seconds)