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