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