Merged bugfix-composer into master

This commit is contained in:
Dmitry Khomutov 2016-06-23 22:53:19 +06:00
commit 9c203693de