Once again vagrant.
Merge branch 'branch-1-0' of github.com:EOX-A/ngeo-b into branch-1-0