Merge pull request #6073 from alalek:fix_5897
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 10 Feb 2016 17:33:12 +0000 (17:33 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 10 Feb 2016 17:33:12 +0000 (17:33 +0000)

Trivial merge