Add changes to marshmallow for Jacket's type
Merge pull request #352 from nd7/adventure-097

Add changes to marshmallow for Jacket's type