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