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