Adding IntegerFilter.

Merge 2.2 branch into master as that branch is no longer needed.  This change actually already is in master (with a different commit hash), but it's neater to merge it properly.