Merge pull request #2556 from castillofrancodamian/wifischedule