Try to fix OS X .mo install path.
Merge remote-tracking branch 'origin/master' into 2.0
Speculative v2 update.