Merge branch 'master' into 'develop'

# Conflicts:
#   index.md
3 jobs for develop in 1 minute and 33 seconds (queued for 1 second)