Marshal clean-up (SF patch #873224)
3 files changed