Merge pull request #887 from berenm/master
authorNico Weber <nicolasweber@gmx.de>
Sun, 4 Jan 2015 01:53:57 +0000 (17:53 -0800)
committerNico Weber <nicolasweber@gmx.de>
Sun, 4 Jan 2015 01:53:57 +0000 (17:53 -0800)
Fix compilation errors on Visual Studio 2015 (_MSC_VER 1900)


Trivial merge