Merge pull request #998 from hnyman/backport-80211r-80211w