Merge branch 'master' into client-test-refact

This commit is contained in:
Nikolay Volf 2016-01-26 17:34:42 +04:00
commit 6f141c1fdb