Рабочая правка
Merge remote-tracking branch 'original/master'

Conflicts:
	composer.json

Change-Id: Iec310b2bfdf4e71415d4baff552870992d31e902


Change-Id: I6280f276df5bd98adb125e08e1b59ff42a87fd12