merge with svn, picked excludedmodules changes