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