[avocado-109] Fix serialization-based unit test failure.
Merge pull request #109 from fnothaft/serializer-fixes

[avocado-109] Fix serialization-based unit test failure.
Merge remote-tracking branch 'upstream/master'