Merge pull request #5572 from systemcrash/80211v