Merge branch 'master' into emit-module-in-strict-mode

tests/cases/compiler/bangInModuleName.ts

@@ -0,0 +1,17 @@
+// @module: amd
+
+// @filename: a.d.ts
+
+declare module "http" {
+}
+
+declare module 'intern/dojo/node!http' {
+    import http = require('http');
+    export = http;
+}
+
+// @filename: a.ts
+
+/// <reference path="a.d.ts"/>
+
+import * as http from 'intern/dojo/node!http';

tests/cases/compiler/errorElaboration.ts

@@ -0,0 +1,12 @@
+// Repro for #5712
+
+interface Ref<T> {
+    prop: T;
+}
+interface Container<T> {
+    m1: Container<Ref<T>>;
+    m2: T;
+}
+declare function foo(x: () => Container<Ref<number>>): void;
+let a: () => Container<Ref<string>>;
+foo(a);