Merge branch 'URIParser'