Merge pull request #2192 from Ansuel/wifi