Fix for Mavericks.
Merge remote-tracking branch 'origin/dev'

* origin/dev:
  Fix for Mavericks.