Fix the merge from 2.1
Fix the merge from 2.1

adube/ngeo,camptocamp/ngeo,adube/ngeo,camptocamp/ngeo,Jenselme/ngeo,Jenselme/ngeo,adube/ngeo,Jenselme/ngeo,camptocamp/ngeo,adube/ngeo,camptocamp/ngeo,Jenselme/ngeo,camptocamp/ngeo