Merge pull request #3192 from jkua:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 8 Sep 2014 11:02:16 +0000 (11:02 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 8 Sep 2014 11:02:16 +0000 (11:02 +0000)

Trivial merge