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