Fixed a typo
Merge commit
Minor changes