Merge remote-tracking branch 'upstream/demo2' into demo2

Conflicts:
	tuf/log.py