Merge pull request #6266 from gongzg:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 15 Mar 2016 12:51:20 +0000 (12:51 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 15 Mar 2016 12:51:20 +0000 (12:51 +0000)

Trivial merge