Merge pull request #6352 from fraserharris:patch-1
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Tue, 12 Apr 2016 15:23:43 +0000 (15:23 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Tue, 12 Apr 2016 15:23:43 +0000 (15:23 +0000)

Trivial merge