5.4.31
Merge remote-tracking branch 'origin/5_4_mountainlion' into 5_4_yosemite

* origin/5_4_mountainlion:
  5.4.31