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