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