Merge pull request #4507 from Ansuel/wifiblacklist