MERGE DS_RPC_BRANCH into MAIN: config-extensions.def     AutoIndent merged 21Jul
MERGE DS_RPC_BRANCH into MAIN:
config-extensions.def
    AutoIndent merged 21Jul

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator