Merge pull request #7466 from Trojahn:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 12 Oct 2016 07:58:37 +0000 (07:58 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 12 Oct 2016 07:58:37 +0000 (07:58 +0000)

Trivial merge