Bring over changes from History.markdown...