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