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