Merge pull request #709 from Frassle/buildfixes
authorFraser Waters <frassle@gmail.com>
Mon, 1 Jan 2018 19:51:22 +0000 (19:51 +0000)
committerGitHub <noreply@github.com>
Mon, 1 Jan 2018 19:51:22 +0000 (19:51 +0000)
Couple of build system fixes


Trivial merge