CDB-3919

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