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