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