Fix broken use of LIBEXEC_PATH
Merge branch 'develop' into develop.macosx