Re-enabled vineban filter
Merge branch 'master' into tzupdate