Update history to reflect merge of #1290 and 1294