CDB-3164

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