Added test harness for serializing a struct with a map in it.
Added harness for serializing a struct with a map in it.
Merge remote-tracking branch 'origin/master'