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