Unqualify Image uri
Merge branch 'master' into no-compile-v8