Merge pull request #4041 from ilya-lavrenov:warning_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 21 May 2015 12:24:46 +0000 (12:24 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 21 May 2015 12:24:46 +0000 (12:24 +0000)

Trivial merge