Merge pull request #3338 from ilya-lavrenov:ios_fixes
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 16 Oct 2014 11:53:41 +0000 (11:53 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 16 Oct 2014 11:53:41 +0000 (11:53 +0000)

Trivial merge