+uri.1.7.1
Merge pull request #2321 from avsm/master

+uri.1.7.1