Merge "Add lshal --neat option"