Merge branch 'arch-changes-from-anthraxx'
authorAlexander Popov <alex.popov@linux.com>
Fri, 20 Jul 2018 17:40:27 +0000 (20:40 +0300)
committerAlexander Popov <alex.popov@linux.com>
Fri, 20 Jul 2018 17:40:27 +0000 (20:40 +0300)

Trivial merge