+uri.1.4.0
Merge pull request #1685 from mirage/master

+uri.1.4.0