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