Merge pull request #174 from davidbgk/942222-resource-uri

Turning Zippy's resource_uri into a solitude one (bug 942222)