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