Merge branch 'master' into fix_parameterized

# Conflicts:
#	test/common.py
4 jobs for fix_parameterized in 5 minutes and 21 seconds
Status Name Job ID Coverage
  Test
passed test_min #185282

00:01:54

passed test_mpi #185283

00:03:34

passed test_mpi_fftw #185284

00:04:11

passed test_mpi_fftw_hdf5 #185285

00:05:20

57.0%