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