Merge pull request #6265 from huang-qiao:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 6 Apr 2016 04:51:58 +0000 (04:51 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 6 Apr 2016 04:51:59 +0000 (04:51 +0000)

Trivial merge