Convert HUNTER_BASE to cmake-style path
Merge branch 'develop' into sugar