Merge pull request #7172 from valeriyvan:iosfixes
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 26 Aug 2016 11:11:49 +0000 (11:11 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 26 Aug 2016 11:11:49 +0000 (11:11 +0000)

Trivial merge