Merge branch 'master' into debian origin/debian
authorDan Breslau <dbreslau@painless-security.com>
Tue, 1 Aug 2017 18:23:59 +0000 (14:23 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Tue, 1 Aug 2017 18:23:59 +0000 (14:23 -0400)

Trivial merge