Merge branch 'from-iad42-1'
authorAlexander Popov <alex.popov@linux.com>
Mon, 30 Jul 2018 20:02:24 +0000 (23:02 +0300)
committerAlexander Popov <alex.popov@linux.com>
Mon, 30 Jul 2018 20:02:24 +0000 (23:02 +0300)

Trivial merge