fixed Vizzuality/cartodb-management#2496 fixed  Vizzuality/cartodb-management#2537
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop