Merge branch 'master' of https://github.com/Automattic/Adbusters

sync with Automattic’s master