Merge remote-tracking branch 'origin/master'

Author: Denis Smetannikov

composer.json

@@ -47,7 +47,7 @@
 
     "extra"             : {
         "branch-alias" : {
-            "dev-master" : "1.0.x-dev"
+            "dev-master" : "1.1.x-dev"
         }
     }
 }