Update history to reflect merge of #1296.
Be (mostly) anal-retentive about line columns. :corn: :stuck_out_tongue: