Fix git error, no actual changes.
authorJennifer Richards <jennifer@painless-security.com>
Fri, 13 Jan 2017 20:02:59 +0000 (15:02 -0500)
committerJennifer Richards <jennifer@painless-security.com>
Fri, 13 Jan 2017 20:02:59 +0000 (15:02 -0500)

Trivial merge