CDB-3844

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