Merge pull request #6305 from rishirajsurti:master
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 14 Apr 2016 08:42:39 +0000 (08:42 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 14 Apr 2016 08:42:40 +0000 (08:42 +0000)

Trivial merge