Use sysconf instead of constant
Merge branch 'develop' into develop.macosx