Merge pull request #956 from adishavit/master
authorKim Kulling <kimkulling@users.noreply.github.com>
Mon, 25 Jul 2016 22:16:16 +0000 (00:16 +0200)
committerGitHub <noreply@github.com>
Mon, 25 Jul 2016 22:16:16 +0000 (00:16 +0200)
Fixes a few build issues with MSVC 2015 and gcc


Trivial merge