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