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