Merge pull request #5678 from neheb/wifidog