Merged with svn changes