Fix #1083 and #1084
Fix #1083 and #1084

camptocamp/ngeo,Jenselme/ngeo,kalbermattenm/ngeo,ger-benjamin/ngeo,adube/ngeo,pgiraud/ngeo,pgiraud/ngeo,adube/ngeo,ger-benjamin/ngeo,camptocamp/ngeo,camptocamp/ngeo,pgiraud/ngeo,adube/ngeo,kalbermattenm/ngeo,kalbermattenm/ngeo,adube/ngeo,Jenselme/ngeo,camptocamp/ngeo,ger-benjamin/ngeo,Jenselme/ngeo,Jenselme/ngeo,camptocamp/ngeo