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