Merge branch 'upstream/master'

Conflicts:
	.gitignore
	khan.cpp
	khan_root/transducers.txt
	stores.txt