Merge pull request #470 from willsowerbutts/buildfixes
authorEtchedPixels <alan@etchedpixels.co.uk>
Wed, 4 Jan 2017 12:54:54 +0000 (12:54 +0000)
committerGitHub <noreply@github.com>
Wed, 4 Jan 2017 12:54:54 +0000 (12:54 +0000)
Minor build fixes


Trivial merge