Merge branch 'master' into no_ts_extension

src/compiler/diagnosticMessages.json

@@ -1947,10 +1947,14 @@
         "category": "Error",
         "code": 2689
     },
-    "Module name should not include a '.ts' extension: '{0}'.": {
+    "A class must be declared after its base class.": {
         "category": "Error",
         "code": 2690
     },
+    "Module name should not include a '.ts' extension: '{0}'.": {
+        "category": "Error",
+        "code": 2691
+    },
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
         "code": 4000