Update CHANGES due merge of branch "svn-master"