Merge branch 'master' into fixCircularReturnType

# Conflicts:
#	src/compiler/diagnosticMessages.json

tests/cases/compiler/classStaticPropertyAccess.ts

@@ -0,0 +1,15 @@
+// @strict: true
+// @target: ES5
+
+class A {
+    public static x: number = 1;
+    public static y: number = 1;
+    private static _b: number = 2;
+}
+
+const a = new A();
+
+a['y'] // Error
+a.y    // Error
+A._b   // Error
+A.a

tests/cases/fourslash/codeFixUndeclaredAcrossFiles1.ts

@@ -1,5 +1,4 @@
 /// <reference path='fourslash.ts' />
-
 // @allowJs: true
 // @checkJs: true
 
@@ -15,7 +14,6 @@
 // @Filename: f1.ts
 //// export class C {[|
 ////     |]x: number;
-////     static y: string;
 //// }
 
 verify.getAndApplyCodeFix(/*errorCode*/undefined, 0);