Merge pull request #6815 from smigielski:fix_6605
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 14 Jul 2016 14:36:45 +0000 (14:36 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 14 Jul 2016 14:36:45 +0000 (14:36 +0000)

Trivial merge