Merge pull request #1262 from esdrubal/uriserializationinfo