CDB 3238

https://cartodb.atlassian.net/browse/CDB-3238