Merge branch 'master' into 1j-dev
Compatibility for Mac OS X.
Compatibility for Mac OS X.