Merge "Put a little space between wifi and data type" into pi-dev