Merge "Handle symlinks to license files in subdirectory" into main