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