Merge pull request #6104 from alalek:issue_6102
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 15 Feb 2016 09:59:35 +0000 (09:59 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 15 Feb 2016 09:59:35 +0000 (09:59 +0000)

Trivial merge