Merge pull request #11690 from peters:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 5 Jun 2018 14:59:16 +0000 (14:59 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 5 Jun 2018 14:59:16 +0000 (14:59 +0000)

Trivial merge