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