Update history to reflect merge of #1190. Fixes #673.