Import new prep logic from userland-gate (commit: e28f4f6)
Update readline to 6.3 (upstream update) (commit: c86ab44)