Merge remote-tracking branch 'origin/master' into hdmi

Conflicts:
	report/gpu/hdmi.tex