fixed #2380
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
fixed #2382
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop