CDB-3673 

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