Merge branch 'master' into 4.x.x

# Conflicts:
#	package.json

Author: robinvdvleuten

.all-contributorsrc

@@ -323,6 +323,16 @@
       "name": "Thomas Meitz",
       "avatar_url": "https://avatars0.githubusercontent.com/u/5236353?v=4",
       "profile": "https://retailify.de",
+      "contributions": [
+        "doc",
+        "test"
+      ]
+    },
+    {
+      "login": "NeuronButter",
+      "name": "Neeron Bhatta",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33238007?v=4",
+      "profile": "http://neeron.me",
       "contributions": [
         "doc"
       ]