hotfix 2012 --> 2013
Merge branch 'develop' of github.com:Vizzuality/gfw into staging