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