Merge pull request #1709 from atsushieno/import-codedom-core