CDB-3497

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