* changes.txt:
merge