Merge pull request #1517 from stweil/typos