Merge pull request #3146 from alalek:extra_for_pr3042
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 21 Aug 2014 16:47:13 +0000 (16:47 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 21 Aug 2014 16:47:13 +0000 (16:47 +0000)

Trivial merge