Merge remote-tracking branch 'upstream/master' into activity-page

Conflicts:
	tapiriik/services/Dropbox/dropbox.py