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