Merge branch 'master', remote branch 'origin'
authorSam Hartman <hartmans@painless-security.com>
Thu, 12 Jan 2017 21:20:26 +0000 (21:20 +0000)
committerSam Hartman <hartmans@painless-security.com>
Thu, 12 Jan 2017 21:20:26 +0000 (21:20 +0000)

Trivial merge