Merge pull request #5985 from Entodi:patch-1
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 21 Jan 2016 10:02:55 +0000 (10:02 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 21 Jan 2016 10:02:55 +0000 (10:02 +0000)

Trivial merge