Merge branch 'master' of www.project-moonshot.org:/srv/git/moonshot
authorDan Breslau <dbreslau@painless-security.com>
Mon, 5 Jun 2017 21:16:10 +0000 (17:16 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Mon, 5 Jun 2017 21:16:10 +0000 (17:16 -0400)

Trivial merge