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