am 862faa12: Merge "Pull in cleaned version.h header."

* commit '862faa12928038759e1bbdbc394a7d58b560f128':
  Pull in cleaned version.h header.