CDB-4051

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