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