Fix typos
minor #940 Fix typos, remove trailing whitespace (ifdattic)

This PR was merged into the 1.0 branch.

Discussion
----------

Fix typos, remove trailing whitespace

Commits
-------

502d104 Fix typos
Merge branch '1.0' into 1.1

* 1.0:
  Fix typos
Merge branch '1.1' into 1.2

* 1.1:
  Fix typos