am d6c93101: Merge "Fix typos spotted by Andreas."

* commit 'd6c93101f81fbdcd68b0fa2965d8af3877d15ea4':
  Fix typos spotted by Andreas.