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