Merge patch for #50