Merge pull request #2599 from castillofrancodamian/wifischedule