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