CDB-3426

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