Merge branch 'master' into 'docs-article-undo-things-in-git'

# Conflicts:
#   doc/articles/index.md