+cstruct.1.3.1
Merge pull request #2350 from mirage/master

+cstruct.1.3.1