Merge pull request #13241 from pasbi:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 22 Nov 2018 14:18:23 +0000 (17:18 +0300)
committerGitHub <noreply@github.com>
Thu, 22 Nov 2018 14:18:23 +0000 (17:18 +0300)

Trivial merge