fix docs, refs #1303
that part makes no sense, refs #1303
allow configuration of serialization behavior, closes #1304
merge 5404c83c3b9eae01e066a0082afe5c5db5944199...ec8729c8b7b46d56533d95b0c52bf0e46fda8a8b (from 1.0)