Merge remote-tracking branch 'debianorg/master' into ticket-2124

Conflicts:
	.gitignore
	setup.cfg
Limit shares accepted by the storage server.
Merge branch 'ticket-2124--debianorg' into ticket-2124--1.10.0