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