Merge pull request #41 from bwhacks/security-fixes
authorSteven Barth <steven@midlink.org>
Thu, 28 Jan 2016 15:59:12 +0000 (16:59 +0100)
committerSteven Barth <steven@midlink.org>
Thu, 28 Jan 2016 15:59:12 +0000 (16:59 +0100)
Security fixes


Trivial merge