mark as merged
minor change
Merge remote-tracking branch 'origin/hguhis' into hguhis

Conflicts:
	hguhis/.gitignore