Avoid Marshal breakage by Yard. Fixes #2415.
Merge remote-tracking branch 'origin/master' into rc2