Update history to reflect merge of #2004