5.5.12
Merge remote-tracking branch 'origin/5_5_mountainlion' into 5_5_snowleopard

* origin/5_5_mountainlion:
  5.5.12