Merge pull request #1172 from Diapolo/serialize_h_rem_typedef