am 182c9f66: Merge "stdint types all the way!"

* commit '182c9f660993abf05825a2d532fe5bba420f11f0':
  stdint types all the way!