Merge "Merge "Wi-Fi, now corporeal!" into pi-dev am: bc6f64d557 am: 52779174be"