Merge pull request #6932 from philippefoubert:bugfix_issue_6931
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 18 Jul 2016 13:23:56 +0000 (13:23 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 18 Jul 2016 13:23:56 +0000 (13:23 +0000)

Trivial merge