Merge pull request #15 from dolonet/sync-upstream-history

Sync upstream history (no-op merge after cherry-pick of #441)