Merge branch 'master' into source_file

Author: mhegazy

package.json

@@ -77,7 +77,7 @@
         "ts-node": "latest",
         "tsd": "latest",
         "tslint": "next",
-        "typescript": "next"
+        "typescript": "2.1.0-dev.20160906"
     },
     "scripts": {
         "pretest": "jake tests",