[BZ 1034359] Trait serialization
Merge pull request #293 from sotty/master

[BZ 1034359] Trait serialization