Merge pull request #7727 from alalek:backport_7536
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 26 Nov 2016 08:10:29 +0000 (08:10 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 26 Nov 2016 08:10:29 +0000 (08:10 +0000)

Trivial merge