Basic 7.6.3
Merge remote-tracking branch 'origin/master'

Conflicts:
	hvm