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