Imported Upstream version 1.6.0.3
Merge tag 'upstream/1.6.0.3'

Upstream version 1.6.0.3

Conflicts:
	.gitignore