merging patch for D6.29-31 from PF, https://github.com/pressflow/6