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