Upgrade history to reflect merge of #1021.