fixed CDB-580
Merge branch 'feature/CDB-580' of github.com:CartoDB/cartodb into feature/CDB-580