Merge remote-tracking branch 'origin/1.0'
authorAnton Anikin <anton.anikin@htower.ru>
Mon, 6 Mar 2017 02:25:44 +0000 (10:25 +0800)
committerAnton Anikin <anton.anikin@htower.ru>
Mon, 6 Mar 2017 02:25:44 +0000 (10:25 +0800)

Trivial merge