Now uses symbolic link path rather than symbolic link target
Merged origin/master