5.4.21
Merge remote-tracking branch 'origin/5_4_mountainlion' into 5_4_snowleopard

* origin/5_4_mountainlion:
  5.4.21