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