Merge remote-tracking branch 'stevee/wlan-client' into next