fixes vizzuality/cartodb-management#2391
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop

* 'develop' of github.com:CartoDB/cartodb20:
  fixes vizzuality/cartodb-management#2518