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