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