am 1bb53054: Merge "Fix class vs. struct mismatch"

* commit '1bb53054f2d77ce570a22629006c849fc54707dc':
  Fix class vs. struct mismatch