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