Merge branch 'master' into 'usage-stats'

Conflicts:
	.travis/install.sh
	reprounzip/reprounzip/main.py
Sets droppoint and certificate for usage reports