Update changes.txt

merge branch master