Merge pull request #6045 from matthieu-ft:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 14 Mar 2016 11:25:22 +0000 (11:25 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 14 Mar 2016 11:25:23 +0000 (11:25 +0000)

Trivial merge