Merge branch 'master' of https://github.com/Microsoft/TypeScript into fixFindAllRefForSalsa

tests/baselines/reference/asyncImportedPromise_es6.errors.txt

@@ -9,5 +9,5 @@ tests/cases/conformance/async/es6/test.ts(3,25): error TS1064: The return type o
     class Test {
         async example<T>(): Task<T> { return; }
                             ~~~~~~~
-!!! error TS1064: The return type of an async function or method must be the global Promise<T>.
+!!! error TS1064: The return type of an async function or method must be the global Promise<T> type.
     }