Merge "Captive portal: better detect empty responses"