Merge fixes from jennifer/filter-dev branch
authorJennifer Richards <jennifer@painless-security.com>
Tue, 11 Jul 2017 15:01:57 +0000 (11:01 -0400)
committerJennifer Richards <jennifer@painless-security.com>
Tue, 11 Jul 2017 15:01:57 +0000 (11:01 -0400)

Trivial merge