fixed #2457 and #2180
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop