Merge pull request #1748 from hnyman/wifidata