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