Ignore dups in history.
Merge branch 'master' into gondwana