bug 967341 - uri management r=honzab a=sylvestre