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