Merge pull request #5880 from alalek:fix_5863
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 4 Jan 2016 05:27:22 +0000 (05:27 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 4 Jan 2016 05:27:22 +0000 (05:27 +0000)

Trivial merge