Merge pull request #661 from martinbudden/bf_tidy_filters