Patch for 1856875, applies to 0.5RC2