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