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