Merge branch 'from-hackurx-2'
authorAlexander Popov <alex.popov@linux.com>
Fri, 27 Jul 2018 21:16:26 +0000 (00:16 +0300)
committerAlexander Popov <alex.popov@linux.com>
Fri, 27 Jul 2018 21:16:26 +0000 (00:16 +0300)

Trivial merge