Fixed inline for Apple OSX Darwin
Merge branch 'osxfix'