Merge branch 'develop' into feature/stream

Conflicts:
	composer.json
	composer.lock

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "347d65d546b37e0a0f459d98687906ad",
-    "content-hash": "e4325cba5a550465b162ab31dd37ecf3",
+    "hash": "e1cdeb4248ab93397c2fa390a76b0c62",
+    "content-hash": "8ad4495699681f4ade03f5e0fbe0b074",
     "packages": [
         {
             "name": "container-interop/container-interop",
@@ -36,7 +36,7 @@
         },
         {
             "name": "ffmpeg/ffmpeg",
-            "version": "2.8.4",
+            "version": "dev-release",
             "dist": {
                 "type": "xz",
                 "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
@@ -533,6 +533,42 @@
             ],
             "time": "2015-05-04 20:22:00"
         },
+        {
+            "name": "ptachoire/process-builder-chain",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/krichprollsch/process-builder-chain.git",
+                "reference": "465055dbcc3b5ef792a768df935571551de4781a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/krichprollsch/process-builder-chain/zipball/465055dbcc3b5ef792a768df935571551de4781a",
+                "reference": "465055dbcc3b5ef792a768df935571551de4781a",
+                "shasum": ""
+            },
+            "require": {
+                "symfony/process": "~2.5 || ~3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Chain": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Pierre Tachoire",
+                    "email": "pierre.tachoire@gmail.com"
+                }
+            ],
+            "description": "Add ability to chain symfony processes",
+            "time": "2016-04-10 08:33:20"
+        },
         {
             "name": "rg3/youtube-dl",
             "version": "2016.04.06",
@@ -931,7 +967,9 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "ffmpeg/ffmpeg": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],