Merge "Fix one minor typo"