Merge pull request #3603 from fritsch/microsoft-js