Merge pull request #6090 from alalek:feature_6089
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 15 Feb 2016 14:17:14 +0000 (14:17 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 15 Feb 2016 14:17:15 +0000 (14:17 +0000)

Trivial merge