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