Merge remote-tracking branch 'origin/ChaoBranch' into ChaoBranch

Conflicts:
	bin/.gitignore