Bug 825853. Port bug 818394 - Universal symlink not created correctly. r=Callek