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