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