Merge pull request #6891 from snosov1:fix-5311
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 14 Jul 2016 11:25:58 +0000 (11:25 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 14 Jul 2016 11:25:58 +0000 (11:25 +0000)

Trivial merge