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