Merge pull request #11174 from corleypc:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 29 Mar 2018 13:50:44 +0000 (13:50 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 29 Mar 2018 13:50:44 +0000 (13:50 +0000)

Trivial merge