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