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