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