Merge minor usage message tweaks (but not version number changes) from