Merge "Fix ReplaceFileExtension() to stop looking for '.' at '/'."