fixes Vizzuality/cartodb-management#2963
Merge branch 'release/2.1' of github.com:CartoDB/cartodb20 into release/2.1