from GitTest2a
Merge remote-tracking branch 'origin/testing' into testing
Including both.
Conflicts:
	README