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