Update CHANGES to reflect some more changes made

... due merge of branch "svn-master"