merged upstream
Merge branch 'master' of github.com:evanwest/adblockpluschrome