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