Merge pull request #859 from feckert/realtime_wlan