Merged svn changes