CDB-3698 

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