Imported Upstream version 4.9.6
Merge remote branch 'origin/upstream4.9' into master4.9

Conflicts:
	config.guess
	config.sub
Applied patch from Joachim