Merge "Revert "(bug 260) Handle <pre> overflow automatically with a scroll bar""