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