am 481c4b64: Merge "Fix class vs. struct mismatch"

* commit '481c4b641ea7d210396f16478c486cabf51db879':
  Fix class vs. struct mismatch