Update history to reflect merge of #1189. Solves #1185.