Merge pull request #8234 from alalek:issue_8121
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 22 Feb 2017 16:21:00 +0000 (16:21 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 22 Feb 2017 16:21:01 +0000 (16:21 +0000)

Trivial merge