Merge branch 'CDB-4369' of github.com:juanignaciosl/cartodb into CDB-4369 (after fixing Jenkins)
Merge branch 'CDB-4369' of github.com:juanignaciosl/cartodb into CDB-4369