Merge pull request #5176 from vladimir-dudnik:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 17 Aug 2015 12:22:15 +0000 (12:22 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 17 Aug 2015 12:22:15 +0000 (12:22 +0000)

Trivial merge