Merge branch 'from-hackurx-1'
authorAlexander Popov <alex.popov@linux.com>
Fri, 20 Jul 2018 17:52:37 +0000 (20:52 +0300)
committerAlexander Popov <alex.popov@linux.com>
Fri, 20 Jul 2018 17:52:37 +0000 (20:52 +0300)

Trivial merge