Fixed 'cannot call rmtree on a symlink'
Resolved conflicts - merged from master