Merge branch 'master' into centos6
authorDan Breslau <dbreslau@painless-security.com>
Wed, 2 Aug 2017 02:42:29 +0000 (22:42 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Wed, 2 Aug 2017 02:42:29 +0000 (22:42 -0400)

Trivial merge