Fixing merge with svn-NPL