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