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