Merge pull request #5809 from alalek:fixup
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 15 Dec 2015 13:52:56 +0000 (13:52 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 15 Dec 2015 13:52:56 +0000 (13:52 +0000)

Trivial merge