Upgraded to URI 0.9.1
Merge branch 'master' into scala-2.11