Merge pull request #1548 from NicolaLS/serde-module