Merge branch 'master' of github.com:Vizzuality/gfw into develop
Merge branch 'develop' of github.com:Vizzuality/gfw into staging