fixed #2308
fixed #2179
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
merged