Merge pull request #2171 from lambdageek/dev/fix-marshal