Merge pull request #1686 from dibdot/wifischedule