Improving operating system support
Merge branch 'macosx-support'