Update history to reflect merge of #1139. Fixes #622.
Merge @mattr's history update with mine