Merge master and update changes.txt