Merge branch '2787_relative_symlink_crash' into 4.8.1-stable