The (de)marshalling generation code is fixed upstream so this patch will no longer be needed after the next release.
Christophe Fergeau