Merge branch 'master' into patch-1

composer.json

@@ -24,11 +24,16 @@
             "name": "Romain Biard",
             "email": "romain.biard@gmail.com",
             "homepage": "https://www.strime.io/"
+        },
+        {
+            "name": "Jens Hausdorf",
+            "email": "hello@jens-hausdorf.de",
+            "homepage": "https://jens-hausdorf.de"
         }
     ],
     "require": {
         "php": "^5.3.9 || ^7.0",
-        "alchemy/binary-driver": "^1.5",
+        "alchemy/binary-driver": "^1.5 || ~2.0.0 || ^5.0",
         "doctrine/cache": "^1.0",
         "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
         "neutron/temporary-filesystem": "^2.1.1"
@@ -39,7 +44,7 @@
     "require-dev": {
         "sami/sami": "~1.0",
         "silex/silex": "~1.0",
-        "phpunit/phpunit": "^4.8"
+        "phpunit/phpunit": "^4.8.36"
     },
     "autoload": {
         "psr-0": {