@JP, could you please merge this one more time? I managed to break OSX. (__UNIX__ *is* defined for OSX. Well, duh.)
@JP, could you please merge this one more time? I managed to break OSX. (__UNIX__ *is* defined for OSX. Well, duh.)