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)
commita3c6cbaf3003fc86851f84c3640e9b454420ba38
tree3eef63a1eda8622d01377284e6d549ec86e66964
parent83348c0e51b0c9005efe34bc22dec24c10a45677
parenta883368f8ce1e2b362be31382301b25dca367850
Merge fixes from jennifer/filter-dev branch