Merge pull request #4598 from Ansuel/wifi_chan