Merge pull request #8819 from Robzz:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 1 Jun 2017 11:57:53 +0000 (11:57 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 1 Jun 2017 11:57:53 +0000 (11:57 +0000)

Trivial merge