Merge branch 'OR-from-anthraxx'
authorAlexander Popov <alex.popov@linux.com>
Tue, 24 Jul 2018 22:41:29 +0000 (01:41 +0300)
committerAlexander Popov <alex.popov@linux.com>
Tue, 24 Jul 2018 22:41:29 +0000 (01:41 +0300)

Trivial merge