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