Merge pull request #9054 from zhmu:upstream
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 3 Jul 2017 16:04:11 +0000 (16:04 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 3 Jul 2017 16:04:11 +0000 (16:04 +0000)

Trivial merge