CDB-3667

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