Merge branch 'master' into portability
Include limits.h in options.c to make PATH_MAX available
Cast const char* to char* to avoid compiler warning
Merge branch 'portability' into cmake