Forward port a number of OSX bugfixes from the trunk to 3.2
6 files changed