Merge "Captive portal: better detect empty responses" into nyc-mr2-dev