put the flag in the right place
Merge branch 'CDB-4434' of github.com:CartoDB/cartodb into CDB-4434