Merge pull request #6433 from schenker:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 19 Apr 2016 16:06:35 +0000 (16:06 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 19 Apr 2016 16:06:35 +0000 (16:06 +0000)

Trivial merge