Merge pull request #9669 from kraj:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 20 Sep 2017 19:06:49 +0000 (19:06 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 20 Sep 2017 19:06:49 +0000 (19:06 +0000)

Trivial merge