Merge pull request #6313 from amannababanana:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 25 Mar 2016 11:31:17 +0000 (11:31 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 25 Mar 2016 11:31:17 +0000 (11:31 +0000)

Trivial merge