Merge remote-tracking branch 'origin/master'

Conflicts:
	test_duck_inscription/bo_settings.py