Add multi-property serialization test.

Currently ignored until we figure out how to determine if something contains a multi-property.
Merge remote-tracking branch 'origin/master'