Merge pull request #6217 from krrishnarraj:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 9 Mar 2016 09:42:17 +0000 (09:42 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 9 Mar 2016 09:42:17 +0000 (09:42 +0000)

Trivial merge