Update history to reflect merge of #2687 [ci skip]