Try_files for 0.6.34

The patch for 0.6.34.