Merge pull request #1443 from esdrubal/userinfoescape