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