Merge pull request #9438 from lpea:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 22 Aug 2017 19:25:09 +0000 (19:25 +0000)
committerGitHub <noreply@github.com>
Tue, 22 Aug 2017 19:25:09 +0000 (19:25 +0000)

Trivial merge