Added versionadded directive
Check for an instance of mapping instead of just dict
Merge pull request #8327 from whiteinge/filter_by-tweaks

Filter by tweaks