Fix
Merge branch 'CDB-1927' of github.com:CartoDB/cartodb into CDB-1927