HPS - 2012-07-05

Patch for trunk