Merge pull request #6311 from peters:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Sat, 26 Mar 2016 19:55:17 +0000 (19:55 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Sat, 26 Mar 2016 19:55:17 +0000 (19:55 +0000)

Trivial merge