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