Merge "stdint types all the way!"