fixed vizzuality/cartodb-management#2492
vizzuality/cartodb-management#2425
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop