Merge "FIx typo in help for -f option"