docs/HISTORY.txt merge=union
