Remove redundant call to lookup root path
Merge branch 'master' into 0.9-dev