Merge "Offer to format data sizes in either IEC or SI." into pi-dev