[pph] Merge from trunk

[Diego Novillo]

I've merged trunk rev 183972 into the pph branch.


Diego.