bundle baseURL fix
Merge branch 'master' into 0.9
add back inject