Merge remote-tracking branch 'sagittarian/resolve-symlinks'