CDB-3718

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