Merge pull request #6100 from alalek:fix_5934
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 15 Feb 2016 02:52:07 +0000 (02:52 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 15 Feb 2016 02:52:07 +0000 (02:52 +0000)

Trivial merge