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