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