Merge branch 'master' into 'sphinx_docs'

# Conflicts:
#   docs/source/conf.py
#   docs/source/field.rst
#   docs/source/index.rst