Fixed typos
Merge pull request #1111 from pborreli/typos

Fixed typos
Merge branch '3.7' into 3.8
Merge branch '3.8'