Rebase linklong against master

Properly this time.