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