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