Merge pull request #4184 from madewokherd/roslynaot