-Fixed error serializing some non-generic collections
Merged conflict