Merge pull request #12111 from seiko2plus:issue12110
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 31 Jul 2018 09:21:41 +0000 (09:21 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 31 Jul 2018 09:21:41 +0000 (09:21 +0000)

Trivial merge