CDB-3103

@see https://cartodb.atlassian.net/browse/CDB-3103