Merge pull request #2291 from akoeplinger/msvc-fixes
authorZoltan Varga <vargaz@gmail.com>
Mon, 7 Dec 2015 01:41:32 +0000 (20:41 -0500)
committerZoltan Varga <vargaz@gmail.com>
Mon, 7 Dec 2015 01:41:32 +0000 (20:41 -0500)
[msvc] Fix Windows build breaks caused by a595d489fa64d8e213c74470f23c576296e2d548


Trivial merge