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