Merge pull request #7655 from alalek:backport_7213
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 14 Nov 2016 13:42:31 +0000 (13:42 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 14 Nov 2016 13:42:31 +0000 (13:42 +0000)

Trivial merge