Merge pull request #8292 from sovrasov:backport_8267
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 28 Feb 2017 11:56:25 +0000 (11:56 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 28 Feb 2017 11:56:25 +0000 (11:56 +0000)

Trivial merge