Merge pull request #1043 from hnyman/ieee80211