Merge from Subversion: