Merge pull request #6928 from K-Shinotsuka:issue4
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 18 Jul 2016 13:51:55 +0000 (13:51 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 18 Jul 2016 13:51:55 +0000 (13:51 +0000)

Trivial merge