Merge "Fix a typo (yeild -> yield)"