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

Conflicts:
	.gitignore
	setup.cfg
Limit shares accepted by the storage server (hardcoded to 1).