Merge branch 'master' into 'sphinx_docs'

# Conflicts:
#   docs/source/conf.py
#   docs/source/field.rst
#   docs/source/index.rst
4 jobs for sphinx_docs in 5 minutes and 42 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
passed test_min #178169

00:02:11

passed test_mpi #178170

00:04:02

passed test_mpi_fftw #178171

00:04:37

passed test_mpi_fftw_hdf5 #178172

00:05:42

57.0%