Merge pull request #1362 from xobs/smtbmc-msvc2-build-fixes
authorDavid Shah <dave@ds0.me>
Wed, 11 Sep 2019 08:57:30 +0000 (09:57 +0100)
committerGitHub <noreply@github.com>
Wed, 11 Sep 2019 08:57:30 +0000 (09:57 +0100)
MSVC2 fixes


Trivial merge