Merge remote-tracking branch 'debianorg/master' into 'debian'

Conflicts:
	.gitignore
	setup.cfg