Fix compilation
Merge branch 'develop' of github.com:feelpp/feelpp into develop