Merge pull request #2632 from dibdot/wifischedule