Merge pull request #1726 from jaredpar/build-roslyn