Merge pull request #7689 from alalek:warnings_2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 22 Nov 2016 13:30:25 +0000 (13:30 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 22 Nov 2016 13:30:25 +0000 (13:30 +0000)

Trivial merge