Bug 967341 - URI management. r=honzab, a=1.1.x+