Merge branch 'master' into greenkeeper/flow-bin-0.37.4

Author: leebyron

package.json

@@ -64,14 +64,14 @@
     "babel-plugin-transform-regenerator": "6.21.0",
     "chai": "3.5.0",
     "chai-json-equal": "0.0.1",
-    "chai-subset": "1.3.0",
+    "chai-subset": "1.4.0",
     "coveralls": "2.11.15",
     "eslint": "3.12.2",
     "eslint-plugin-babel": "4.0.0",
-    "eslint-plugin-flowtype": "2.29.1",
+    "eslint-plugin-flowtype": "2.29.2",
     "flow-bin": "0.37.4",
     "isparta": "4.0.0",
     "mocha": "3.2.0",
-    "sane": "1.4.1"
+    "sane": "1.5.0"
   }
 }

src/error/GraphQLError.js

@@ -8,7 +8,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-import { getLocation } from '../language';
+import { getLocation } from '../language/location';
 import type { ASTNode } from '../language/ast';
 import type { Source } from '../language/source';