Merge pull request #7044 from wolever:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 9 Aug 2016 12:59:38 +0000 (12:59 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 9 Aug 2016 12:59:38 +0000 (12:59 +0000)

Trivial merge