Merge pull request #10604 from aimotive:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 17 Jan 2018 09:40:42 +0000 (09:40 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 17 Jan 2018 09:40:42 +0000 (09:40 +0000)

Trivial merge