Typo merge

Merging master' with the master branch.