Fix Travis CI failures due to dirty working dir
WIP: MarshalBinary