Merge branch 'from-hackurx-3'
authorAlexander Popov <alex.popov@linux.com>
Wed, 8 Aug 2018 12:29:23 +0000 (15:29 +0300)
committerAlexander Popov <alex.popov@linux.com>
Wed, 8 Aug 2018 12:29:23 +0000 (15:29 +0300)

Trivial merge