am 7176a617: Merge "Don\'t use typedefs that hide *s."

* commit '7176a61718e7b45a8fde3a25eada0c9425d1dece':
  Don't use typedefs that hide *s.