Merge remote-tracking branch 'origin/develop' into develop

Author: n3vrax

composer.json

@@ -32,8 +32,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.2-dev",
-      "dev-develop": "0.3-dev"
+      "dev-master": "0.1-dev",
+      "dev-develop": "0.2-dev"
     }
   }
 }