Merge branch 'master' into q

Conflicts:
	DontReadMePlease.txt
q commit
zxxzc
Merge branch 'master' into q

Conflicts:
	DontReadMePlease.txt