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