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