Merge branch 'vendor/WPA_SUPPLICANT'