Fix patch
Merge branch 'fix_nonrelative_url' into local