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