Merge pull request #6375 from ohnozzy:Bug-Fix-for-Issue-6288
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Wed, 13 Apr 2016 07:51:33 +0000 (07:51 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Wed, 13 Apr 2016 07:51:33 +0000 (07:51 +0000)

Trivial merge