Merge "Fix typo in contributor guide"