osx compat

Armin Felder requested to merge osxcompat into master

Merge request reports