Update the linklog branch by rebasing off master

Hopefully useful for the 2.5 branch.