Merged typos branch.