Merge branch 'master' into issue-74

Author: Phillip Clark

.jshintrc

@@ -3,5 +3,7 @@
   "strict": true,
   "laxcomma": true,
   "nomen": false,
-  "indent": 2
+  "indent": 2,
+  "esversion": 6,
+  "browser": true
 }

.travis.yml

@@ -5,7 +5,7 @@ branches:
 node_js:
   - "6"
   - "5"
-  - "4.2.1"
+  - "4"
   - "0.12"
   - "0.11"
   - "0.10"

Readme.md

@@ -12,6 +12,14 @@
 
 ## ChangeLog
 
+`0.3.5`  - 2017-04-23 — Rolled up recent fixes; patches:
+* @stevemao — #79, #80: now testing latest version of node4
+* @mortonfox — #85: referencing mocha's new home
+* @tdebarochez — #90: fixed error when .toString not a function
+* @thiamsantos — #92, #93: changed module system for improved es2015 modules
+
+`0.3.3` - Thanks @SimenB: enabled npm script for release (alternate to the Makefile). Also linting as part of `npm test`. Thanks @joeldenning: Fixed issue #35; diffs of top level arrays now working.
+
 `0.3.3` - Thanks @SimenB: enabled npm script for release (alternate to the Makefile). Also linting as part of `npm test`. Thanks @joeldenning: Fixed issue #35; diffs of top level arrays now working.
 
 `0.3.2` - Resolves #46; support more robust filters by including `lhs` and `rhs` in the filter callback. By @Orlando80
@@ -39,7 +47,7 @@ bower install deep-diff
 
 ## Tests
 
-Tests use [mocha](http://visionmedia.github.io/mocha/) and [expect.js](https://github.com/LearnBoost/expect.js/), so if you clone the [github repository](https://github.com/flitbit/json-ptr) you'll need to run:
+Tests use [mocha](http://mochajs.org/) and [expect.js](https://github.com/LearnBoost/expect.js/), so if you clone the [github repository](https://github.com/flitbit/json-ptr) you'll need to run:
 
 ```bash
 npm install
@@ -225,8 +233,9 @@ The `prefilter`'s signature should be `function(path, key)` and it should return
 
 Currently testing on Travis CI against:
 
-+ nodejs `4.2.1`
++ nodejs `6`
++ nodejs `5`
++ nodejs `4`
 + nodejs `0.12`
 + nodejs `0.11`
 + nodejs `0.10`
-+ nodejs `0.8`

bower.json

@@ -1,28 +1,35 @@
 {
   "name": "deep-diff",
   "main": "index.js",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "homepage": "https://github.com/flitbit/diff",
   "authors": [
-  "Dan Drinkard <[email protected]>",
-    "Daniel Spangler <[email protected]>",
-    "Denning <[email protected]>",
-    "Elad Efrat <[email protected]>",
-    "Mats Bryntse <[email protected]>",
-    "Nicholas Calugar <[email protected]>",
-    "Paul Pflugradt <[email protected]>",
     "Phillip Clark <[email protected]>",
-    "Serkan Serttop <[email protected]>",
     "Simen Bekkhus <[email protected]>",
-    "Tom Ashworth <[email protected]>",
-    "Tom MacWright <[email protected]>",
+    "Paul Pflugradt <[email protected]>",
+    "wooorm <[email protected]>",
+    "Nicholas Calugar <[email protected]>",
     "Yandell <[email protected]>",
+    "Thiago Santos <[email protected]>",
+    "Steve Mao <[email protected]>",
+    "Mats Bryntse <[email protected]>",
+    "Phillip Clark <[email protected]>",
     "ZauberNerd <[email protected]>",
-    "caasi Huang <[email protected]>",
+    "ravishivt <[email protected]>",
+    "Daniel Spangler <[email protected]>",
+    "Thomas de Barochez <[email protected]>",
+    "Morton Fox <[email protected]>",
+    "Amila Welihinda <[email protected]>",
+    "Will Biddy <[email protected]>",
     "icesoar <[email protected]>",
+    "Serkan Serttop <[email protected]>",
     "orlando <[email protected]>",
-    "ravishivt <[email protected]>",
-    "wooorm <[email protected]>"
+    "Tom MacWright <[email protected]>",
+    "Denning <[email protected]>",
+    "Dan Drinkard <[email protected]>",
+    "Elad Efrat <[email protected]>",
+    "caasi Huang <[email protected]>",
+    "Tom Ashworth <[email protected]>"
   ],
   "description": "Javascript utility for calculating deep difference, capturing changes, and applying changes across objects; for nodejs and the browser.",
   "keywords": [

component.json

@@ -1,7 +1,7 @@
 {
   "name": "deep-diff",
   "description": "Javascript utility for calculating deep difference, capturing changes, and applying changes across objects; for nodejs and the browser.",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "license": "MIT",
   "keywords": [
     "diff",