Merge pull request #2815 from Aletheios:Bugfix#3705
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 14 Jul 2014 12:19:31 +0000 (12:19 +0000)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 14 Jul 2014 12:19:31 +0000 (12:19 +0000)

Trivial merge