Merge pull request #6883 from ilya-lavrenov:resize
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 12 Jul 2016 14:35:25 +0000 (14:35 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 12 Jul 2016 14:35:25 +0000 (14:35 +0000)

Trivial merge