CDB-3797

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