Merge "status: lose dependence on StringIO"