CDB-3133 Bugfix and copy change
Merge pull request #646 from CartoDB/CDB-3133

CDB-3133