Merge "Fix a typo in docstring"