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