Merge pull request #6414 from mshabunin:fix-macosx-warnings
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Sun, 17 Apr 2016 22:11:57 +0000 (22:11 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Sun, 17 Apr 2016 22:11:57 +0000 (22:11 +0000)

Trivial merge