Merge pull request #5281 from ilya-lavrenov:ml2
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 2 Sep 2015 11:38:45 +0000 (11:38 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 2 Sep 2015 11:38:45 +0000 (11:38 +0000)

Trivial merge