merge master -D org -I include -E exclude: PR 123 (Fix whitespace in conflict message.)
merge master -D org -I include -E exclude: PR 124 (Drop TestGithub from TestConfig integration tests)