5.6.4
Merge remote-tracking branch 'origin/4_6_mountainlion' into 5_6_yosemite

* origin/5_6_mountainlion:
  5.6.4