Merge pull request #5992 from ejoebstl:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 20 Jan 2016 16:31:40 +0000 (16:31 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 20 Jan 2016 16:31:41 +0000 (16:31 +0000)

Trivial merge