Merge pull request #3086 from fpuja:pragma_warning4127_fixing
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 16 Aug 2014 16:50:41 +0000 (16:50 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 16 Aug 2014 16:50:41 +0000 (16:50 +0000)

Trivial merge