CDB-3696

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