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

Author: saschanaz

package.json

@@ -75,7 +75,7 @@
         "through2": "latest",
         "travis-fold": "latest",
         "ts-node": "latest",
-        "tslint": "next",
+        "tslint": "4.0.0-dev.3",
         "typescript": "next"
     },
     "scripts": {