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