Update history to reflect merge of #795. Fixes #790.