Added patch for 9.5 along with interdiff with #31.