merged MappingPDXSerializer with master

This commit is contained in:
David Turanski
2013-01-04 08:15:35 -05:00