Merge branch 'master' into pr/13

Author: mikermcneil

package.json

@@ -3,8 +3,8 @@
   "version": "3.0.3",
   "description": "Structured Node.js bindings for MySQL.",
   "scripts": {
-    "test": "node ./node_modules/mocha/bin/mocha --recursive",
-    "fasttest": "node ./node_modules/mocha/bin/mocha --recursive",
+    "test": "node ./node_modules/mocha/bin/mocha --recursive --timeout 10000",
+    "fasttest": "node ./node_modules/mocha/bin/mocha --recursive --timeout 10000",
     "pretest": "npm run lint",
     "lint": "node ./node_modules/eslint/bin/eslint . --max-warnings=0",
     "docker": "docker-compose run adapter bash"