CDB-1788
Merge branch 'CDB-1788' of https://github.com/CartoDB/cartodb into CDB-1788