Cleans up localRoot detection
Bumps version
Merges with upstream