Merge pull request #1009 from joelmartinez/msdoc-import