Fixed a bug where Palantir is not disabled in autoconf
Merge branch 'master' into develop
Merge branch 'develop' into tidying