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