Merge pull request #1053 from rdb/patch-2
authorKim Kulling <kimkulling@users.noreply.github.com>
Wed, 2 Nov 2016 19:12:59 +0000 (20:12 +0100)
committerGitHub <noreply@github.com>
Wed, 2 Nov 2016 19:12:59 +0000 (20:12 +0100)
Fix compile error with MSVC 2015


Trivial merge