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