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