fixed CDB-477
Merge branch 'cdb-113' of github.com:CartoDB/cartodb into cdb-113