Merge pull request from carbn/master Update blocklists with giosg and cuuma