Merge pull request #10329 from jasjuang:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 28 Dec 2017 16:45:16 +0000 (16:45 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 28 Dec 2017 16:45:16 +0000 (16:45 +0000)

Trivial merge