Remove non-working domains from domain list
Merge branch 'master' into 2.5.0