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