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