Set absolute paths
Merge commit '2fc4017'