Rescue from the conflict
Merge branch 'master' of github.com:unepwcmc/SAPI-client