Merge remote-tracking branch 'glencoe/master' into license-changes

Conflicts:
	.gitignore