Merge pull request #363 from rqou/master
authorClifford Wolf <clifford@clifford.at>
Tue, 18 Jul 2017 13:21:12 +0000 (15:21 +0200)
committerGitHub <noreply@github.com>
Tue, 18 Jul 2017 13:21:12 +0000 (15:21 +0200)
Miscellaneous build tweaks


Trivial merge