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