More accurate search counts, fix conflict with pop-up blocker extension
Merge branch 'master' into production