Merge "Diff and history link separated via CSS"