Merge pull request #460 from mithro/g3-fixes
authorClifford Wolf <clifford@clifford.at>
Sun, 26 Nov 2017 06:16:06 +0000 (07:16 +0100)
committerGitHub <noreply@github.com>
Sun, 26 Nov 2017 06:16:06 +0000 (07:16 +0100)
Bunch of small fixes


Trivial merge