Merge branch 'master' into fix_parameterized

# Conflicts:
#	test/common.py
4 jobs for fix_parameterized in 5 minutes and 21 seconds