Merge branch 'master' into debian v1.0.0
authorDan Breslau <dbreslau@painless-security.com>
Mon, 24 Jul 2017 22:22:12 +0000 (18:22 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Mon, 24 Jul 2017 22:22:12 +0000 (18:22 -0400)

Trivial merge