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