Fix struct/class mismatch in forward declaration.
Merge branch 'master' into compatibility